From 813b253439aca619a7b5e717a8f20f689d9f9c16 Mon Sep 17 00:00:00 2001 From: Ted Zlatanov Date: Tue, 29 Oct 2013 13:54:16 +0000 Subject: [PATCH] lisp/gnus/nnimap.el: Search the netrc entries for the logical server name, then the actual --- lisp/gnus/ChangeLog | 7 +++++++ lisp/gnus/nnimap.el | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 955339880f8..701457bc8a6 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2013-10-29 Teodor Zlatanov + + * nnimap.el (nnimap-open-connection-1): `auth-source-search' for the + `nnoo-current-server' first, then for the actual `nnimap-address' to + allow netrc entries for the nnoo server to coexist with netrc entries + for the `nnimap-address'. + 2013-10-23 Katsumi Yamaoka * mm-decode.el (mm-dissect-buffer): Revert last change. diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index f8c2b24cc9f..2220c81e775 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -456,8 +456,8 @@ textual parts.") (nnimap-credentials (gnus-delete-duplicates (list - nnimap-address - (nnoo-current-server 'nnimap))) + (nnoo-current-server 'nnimap) + nnimap-address)) ports nnimap-user)))) (setq nnimap-object nil) -- 2.30.2